dgit.raspbian.org Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4f75295 5c56088)

author	Glenn Morris <rgm@gnu.org>
	Sun, 30 Dec 2012 18:09:01 +0000 (10:09 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Sun, 30 Dec 2012 18:09:01 +0000 (10:09 -0800)
commit	d5e5e7b41166815a843148f2081d19bc14b628b2
tree	6afd575b3a741ce26e5ec1e2665d45dfab8cbb52	tree \| snapshot
parent	4f752957f174b5ab95ef6b9428669b1b1ecf0bab	commit \| diff
parent	5c560880659048888420389c02e20d6867ec81df	commit \| diff

Merge from emacs-24; up to 2012-12-05T00:13:56Z!yamaoka@jpl.org

12 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
etc/NEWS	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/net/tramp-sh.el	diff1 \|	diff2 \|	blob \| history
lisp/org/ChangeLog	diff1 \|	diff2 \|	blob \| history
msdos/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/Makefile.in	diff1 \|	diff2 \|	blob \| history
src/dispextern.h	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.